From 956ac933c8d41af4fa4bfa177c5a3bb8e5ca533a Mon Sep 17 00:00:00 2001 From: "awilliam@xenbuild.aw" Date: Mon, 28 Aug 2006 14:09:31 -0600 Subject: [PATCH] [IA64] fix noreboot option fix machine_hlt to support noreboot option. Signed-off-by: Akio Takebe [modified to use existing cpu_halt() function in linux-xen files] Signed-off-by: Alex Williamson --- xen/arch/ia64/linux-xen/process-linux-xen.c | 2 ++ xen/arch/ia64/xen/domain.c | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/xen/arch/ia64/linux-xen/process-linux-xen.c b/xen/arch/ia64/linux-xen/process-linux-xen.c index aaaaaca0fe..5f04985cf9 100644 --- a/xen/arch/ia64/linux-xen/process-linux-xen.c +++ b/xen/arch/ia64/linux-xen/process-linux-xen.c @@ -810,6 +810,7 @@ get_wchan (struct task_struct *p) } while (count++ < 16); return 0; } +#endif // !XEN void cpu_halt (void) @@ -834,6 +835,7 @@ cpu_halt (void) ia64_pal_halt(min_power_state); } +#ifndef XEN void machine_restart (char *restart_cmd) { diff --git a/xen/arch/ia64/xen/domain.c b/xen/arch/ia64/xen/domain.c index 5eca64e9a3..0fadeffad0 100644 --- a/xen/arch/ia64/xen/domain.c +++ b/xen/arch/ia64/xen/domain.c @@ -1123,13 +1123,15 @@ void machine_restart(char * __unused) while(1); } +extern void cpu_halt(void); + void machine_halt(void) { console_start_sync(); if (running_on_sim) printf ("machine_halt called. spinning...\n"); else - (*efi.reset_system)(EFI_RESET_SHUTDOWN,0,0,NULL); + cpu_halt(); while(1); } -- 2.30.2